Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 20 Mar 2010 10:43:59 +0000 (10:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 20 Mar 2010 10:43:59 +0000 (10:43 +0000)

Trivial merge